Finished up v1 frontend