Moved some stuff into headers