proj2 ready for testing