v1.7

Works, but the base idea is wrong.