Sixth Commit. tidying everything up some more, having a hard time finding reasons to commit.