Commits


import some bits from libphos