general design changes

Signed-off-by: McRoy <mcroy.mike@gmail.com>