Working on this...
* SPECS ARE NOT PASSING YET