Add to the refactor list? I'll keep what I have for now