Continuation of my CS202 final project