Working on refactor...