the basics are working.
Cleaned up some code.
Merge branch 'master' into dev
how did this happen @.@