renaming classes and stuff, updated to work without market