refactored, added some options, wireframes not yet working
wireframe still broken, but refactored and stuff, pushing anyway