1.9dev commit. Changed database caching and objects. Added effects. UNTESTED