Implement more of the obf system