Merging front end project, adding tracing and profiling