Began portig over, most work was done in Graphics