Finish proof of concept implementation