f66a1a
move type delcarations after attribute delcarations to fix a typeattribute ordering issue. comment out the TODO types with a # so they don't get moved