Working through bugs in server related to query User and such. Added a retry count to help alleviate crashes