Modified all resources, added lots of functionality