Implement some stuff that isn't tested at all