Restore point

Things are currently mostly working and I'm about to do serious stuff
with error handlers which could break it all