am I missing something or are you in the middle of a refactor here...