Continuation of Major Refactor

Code is massively refactored, and testing continues