Interim checking, flake partially integrated (soon to be ripped out.)