25% working.  re-using classes from assignment 1