Switching now posible. Minor Errors and some cleanup needs to be fixed.