Re-factored to fix high lighting the next day.