Initial bugs fixed (squashed merge from chiggins_test branch)
favorite feature initial merge commit