Redid all the stuff I should've commited at work... Can now create a list of classes and map them