new features almost ready!