Got things cleaned up and working it seems