fixed file structure, updated features
features in place
fixing file structure thanks to sublime keeping deleted files open
commented other features cause they break our tests
added 1 scenario
added will and robins edits
resolved merge conflicts