building out more functionality