Move stuff around, hopefully fixes delegate