WIP on State module
Fix up List.hs and most of State.hs - one is still hanging