Added comments and some cleanup.Strongly typed class being used by UI search now