Started adding a couple of new features.