refactoring stock commodity and other stuff.