Almost done with new features