version bump
refactor into resource and action objects
refactor and fix collection bug