Progress on refactor (it builds now)