Implement some more