New file etc
Move instance variables to shared
Initial conversion for PolyFormContainer
Initial conversion for PolyFormContainer
Separate draw testing and container testing