Continued to flesh out basic implementation.