More functionality working