Simplify macro, work out kinks