Add acor stuff, move some stuff into utils, etc