Grosso refactoring, frontend PM