More functionality, core logic complete