screwed everything up and hardcoded everything
Merge branch 'master' into development3