Overhauled package
Closes #2