last commit before i go about wrecking this attachment business