Expose

Changed a few things..