Refactor Error
Move draw commands to VAO (ref #46)