nightly update 03/20

Basic layout is complete, need to add afew things and squash a couple
bugs still