Combined all the rest of the relevant functions into their appropriate files to help keep this project clean.