Update
Almost Done

Everything but the editing functionality works here