Last commit, added adapters, cleaned up some unused methods, removed
awkward table naming