OpenCollar Sub AO - 3.600

Current files ready for porting into GIT