mad changes

sorry bros but this is a messy checkin.