Merge in Vesko's frontend work