Big commit. Deletion now handled. Options supported too.