Updated command parser. property search and binding search still outstanding.
First working version with property search.