Made a start on getting everything integrated