Suggested changes to flesh-out scope and structure