Project name changed... A few changes to the delegation pattern. Needs more work to be finished...