Reverting to all drawing being done inside one function