Added a ToC and potential design issues