Working implementation + test app