Finish frontend serving refactor
I don't even remember what this is all about