Refs #18

Urgent fix for front end conflict