Made code ready for initial push.