Front end

merging work so far