beginning to make responsive
merging
working prototype