Bios

I need #157 merged, and then I can bring those updates into this branch, until then, review away!
Can we stack these class names, please?