further wip
WIP
improvments
gui is working