Finished copying code from previous project