Wip overall rework
Wip building GUI