Clean-up and beginning of front-end

Well. Okay.