GUI re-implemented, initial tests