Merged Logan/Manny's draw functions into index.js