Nightly into Master

Master will become my working branch in this repo