Youri's initial look

Initial look at what we have so far, plus some cleanup and setting up
some basics