Cleaned up settings code, added basic operations.
Heading to one place container initialization.