Initial commit of complete rework (#3)

-Added current textures
- Fixed class references from static to non-static