Completed basic functionality, minus a small glitch with adding a class.