Finished transformer + more work on API