reorgnizing to make things easier to set up