Got most features working