Switched to clean new workspace. rewriting from scratch