working, needs refactor/styling
regex fu
git commit fu
stuff is no longer here