More functionality, fleshed out