State: Objects instead of ints. Use scratch objects where possible.
header fixes