shape components added, drawableSystem implemented
merge