Trying to make a better stock implementation