Thought you were going to refactor this and the methods below.