Currently working minus some issues with deletion