New Features Into Master

Pretty sure this all works.