Missed some stuff from the UML. Now we should really be able to start tests