Updated the rest of the code lines

Will branch off and keep working on this now.