include files. This cleaned up the code quite a bit and should make it
pretty easy to add additional types in the future.