lots of changes by Jess and Keely in class