Added Box and Switches

Added to master