Work in progress on the macro library.