Commented draw functions, added (commented out) work for lighting pass