refactoring, tidying, improving messaging
basic working happy path