Add C0 stuff, make it a little more system-agnostic