New implementation, failing unit tests