Trying to make distributable