huge refactor

Signed-off-by: Ben Sapp <ben.sapp@gmail.com>
Merge branch 'master' of https://github.com/bmsapp/sappworks.stocks.public