Still reworking Planning Module