change to solo query method
Merge remote-tracking branch 'origin/rossdylan' into search
Added a series of validation functions and worked on the user views a bit