Adding 2-way data binding and ordering