Added modal, fixed and labelled all TODO