Done with the comments, with no help from Stephon at all