haven't update this in a bit, really should
pre-"tier one update" commit