Some new features

Playing around with the library a bit to get used to it. Added some CLI commands and some small new functionality.