Have finished all required features except delete buttons