Front end version two work in progress