Further adapter work
new adapter stuff