Grimley517 issue4

Not ready for merge yet.  pull for dicussion only at moment