Think those steps should be added before I merge this, or later?