Small edits; added struct skeleton