Adding work on making this a better place, running out of time for now