Added some integration.  Need to use properties now.