Fixed several bugs in timing behaviour, oopsie
Finished the prototype