Stripping this down to just the .m and .h files