In process of adding a front end
merge some stuff