WIP: converting to restartless.