got rid of unneeded includes, added setters
got rid of some duplicate code, made it compile and pass tests
changed things so it will compile