Added first draft with statuses
Pulled for merging