copied some stuff over from school repo on bitbucket