More functionality, but still some work to do