Something odd happened with the merging, didn t pull before writing more code I think