Full blown refactor