Final Cleanup, not fully implemented

Final cleanup for submission. Project not fully implemented