WIP: clean up, load & save, goto