Finalized this functionality, ready for shredding