Tons of edits, starting to come together though