Renamed package; Commented out logs; Still buggy and in need of caching