updated prework
changed things around to fit in new naming scheme