Re-enabled manual stuff
Opened up possiblity of mode cycling, recommend manual until test time.