Finish out initial implementation.