Working front end, mostly
Merge fix