added first draft for frontend files
added merge