Successful refactor

Still need to address bug where NULL stock appears when selecting
trending menu.