Did more dip switch stuff
Merge branch 'temp'