WIP - macro overhaul,