Forgot to commit this last time

Finishes up code added in last commit