Front end merge! 

merging latest version of the