Removed some junk, added lists, new type methods