Finished off first version of frontend