More General Components

See code for comments that pertaine to you, also please look it over to
see if we are on the same page. @BBKING55, I put something in GUI for
you to see.