Toying with new API.
Needs lots more work!