small refactor
add states
Sec D
models & forms F-M