moving to a more contained desing