Pushing some frontendedness
Resolving conflicts