Donald committing just src files with some changes to his code
Donald, conflicts resolved.