Main switch added :tada: