phase 4 threat 5 changes
Tim and Matt branches merged
Switch user bug fixed
Temporary hack