Switched to a case statement. WAY easier to read.
Fixed formatting; not sure why this keeps breaking
Working on SRP6 connection
Pulled in Josh's changes manually to get
Fixed Josh's changes in local copy