Rewrote deleted code and created package