Good job but personally I prefer to have all my macros separate.