Refactoring and making the Project Collections work.