I thought I could just do an easy fix for the quality for now but I didn't want to invest any more time into code we're going to throw away soon anyway for the features mentioned here

I hope I'll have it done next week