Added a few more interfaces

to help build up the intent of the solution structure