ok got close sort of working
tidy naming