foci are done & refactored a bit

finished up the foci

Refactored some of the switch statements to use fall through if they
have the same operation