[neb519]

Thanks for the feedback. I'll have to see how nasty of a refactor this would be...