more 4.2.1 stuff, still a mess.

Signed-off-by: JamieD81 <jamied81@gmail.com>