@wip Re-worked structure. quit key now works