Finalized code for repo