Create nice macros, move instructions to new file