In major need of an overhaul...

Some day soon