Initial Check-In

-Initial Check-In and more minor clean up, readying for demos