Merge frontend + functionality v2