WIP changes - getting everything hooked up and compiled