First Pass at Refactoring Bios