Adding more objects (a basic starting state module, some work on containers, etc)