Nightly Commit

Pretty good overhaul today, but it's coming along well.