Edits trying to get framework working.