that’s the basics working

need to work out how to test this properly…