Most work done on suspend

Still to do is the correct user profile to select