sorted properties and added todo