Revisions for separation
Adds separation
Separation of concerns