Moved macros around, removed formats, updated TODO