Overhauled package
Closes #1