a3.3.0 BROKEN - START OF REFACTOR

- Broke stuff because need for refactoring has caught up to me.
- Beginning refactor.
- THIS BUILD DOES NOT WORK
- Go back to last build if you need it working.
- DELETING LOTS OF COMMENTS.