added a bunch of stuff in master
changed line two on feature branch