moved things to custom, updated, and removed branch