Updated to final structure and starting to polish.