the start of something new refactor on the way