Mjeverson/dev

A whole whack of updates and fleshing out