Removed some commented-out code
Fixed a lint error
Taken out the full defineProperty - handled elsewhere now
Added Resource and Store