Actual commit working
Better handling of addition and deletion