Edging closer to getting the new features working...