Fleshed out Package a bit more