Moved HP/FP/ER into their own box.