Stocktype

I'm merging this and will probably just start cleaning up from master while the turmoil continues. After things settle, I'll start back on the PR workflow.