Started rewrite of DrawingSvc