major overhaul to front-end