Working on client mount check. State not being saved.
Merge branch 'master' into mount_check
Cleaned up imports, moved them all to header files. Updated git ignore. Got client to maintain mounted state.