Added more properties to the WCommand object and started reimplimenting the search functionality