MP: Verbosity in trace loop
MP: Remove unused classes (for now....)
MP: Builder type pattern for V3
MP: Unnnecessary update
MP: Tidying...
MP: Oops, mangled the sky in a previous commit. Thanks git-bisect!