Slowly making this slightly less terrible.