ok, not quite fully working. Test on prototype