Includes edits

@tylerrainbolt