New features working, ready for testing