Two classes updated. Ready for backend binding