Revert 575a931..60c35ae

This rolls back to commit 575a931e648e4a278c5614562904059bf48e0138.
Revert 60c35ae..e351706

This rolls back to commit 60c35ae5ab7263bd580740cfb3b602461ccefdbe.
Working trap as of 23-05-2014

All functionality for get, set, and trap working.