New models, DEAL WITH it
Merge branch 'Windows' of https://github.com/CarlRapp/Agile into Windows