Now useable

This is getting pretty elegant.