Framework

merging in basic setup for front end