Merging the frontend stuff