Added a bit more functionality to the main package.