Removal hasn't be implemented, everything else tested/working