Added muti-stock functionality, working on classing