main 2.4

Almost finished, adding emergency off switch