Partial Commit of redesign

Signed-off-by: Nilkamal Weerasinghe <wnilkamal@yahoo.com>