Added in a few more things to Current.