front-end works... in a hacky way
fixing merge