Reworked Graphics to partially use Transform