moving stuff from class repo