Add proper use of inject.
Add additional functions to fill in.