think you can drop the first type declaration here. Not a big deal -I'll just clean it up when merging.