Base commit working on planning and plots