Ryan a dev branch

Merging the branches back in to do some branch restructuring.