moved properties to a class continuation where possible, cleaned up header imports