Issues remain

But code is in place