Checking in the GUI so far so others are not blocked by me. It's not done and it looks ugly so far