Started to add a bit more of the interface