Starting to refactor into something I can show.