Further fleshed out the stock class