filled in everything besides the draw method
Merge branch 'master' into luke