Milestone 5

Merge final FE changes into develop