Reworked files so I can build and ONBUILD fires