something is broken
progress on refactor