Tidying api again, start Switchable