Writing front-end stuffz
Merge fix