Code clean up
Merge branch 'master' of github.com:dax105/blocks
Switched to VBO's