rebasing
fucken shit fucked the rebase
merge conflicts - this isn't getting any better
minor styling tweek