noted a bug
bit of quick dev for #6
Working, needs testing and error logic