Stubbed out rest
Merge
Bug fix