WIP  nature. There are more places that use the ::draw call and they all need to be converted.