Work on project refactor. BROKEN.