minor changes slowly moving to something more modular and responsive