Started moving positions to model
Some more on Links
Merge branch 'master' of https://github.com/cadet/UberQuick