Final stage of red green refactor demo