Frontend work
Resolve merge conflicts