Final changes before handing in, couldn't finish documentation nor test classes because of circumstances. This will be done upcoming sunday.
Added some documentation, not feeling well enough to really work on it, next shot tomorrow...