Move magic to seperate header