Drawing working consistently now