Updated

AddNew is still in progress for the sorting, take a look