simplifying cli, restarting things in 'library'
style