Started work on adding classes programatically