started on switch integration
working through problem with switch