todos added, plots seem strange? part 1 hopefully nearly done?