Major Code Refactor 1.0