Done with comments. Submitting as soon as I do one last run through of the functionality to make sure nothing crashes