Manually merged in code for 'front' from old, non-git project