Removed unneeded code and verified use of functions. project is essentially
complete except for some live testing and cache testing/experiments