Continuation of Class Project