Last fully functioning commit after fixing proj2. Now will be going all in on proj3.