wow what a refactor