Switch the model back to what we had originally, Questions have answers. Fixed all the functions. Junit tests needs reviewing.