Initial changes

Memcache still needs to be implemented