Mostly done

Adding via switch doesn't work