committing to allow pulling
still merging
Pending spec/request tests added