Some changes to my initial download of the framework + some notes for Dwayn