Saving last working commit before major refactor.