cleanup
cleanup
moving towards class to manage destinations, partially broken