Adding in more macrofun