Move things into functions
Merge branch 'master' of https://github.com/icedtrees/mantis
Fix velocity things
Merge branch 'master' of https://github.com/icedtrees/mantis
Merge branch 'master' of https://github.com/icedtrees/mantis
Fix bugs and stuff