attempting to pull new front end
merging files
fixed functionality