first take at refactor
running at basic level-ish
looks like back to normal
updated graphics/stylings