Commit after class and some edits