Design tests

Merge front end in to master - pretty please :)