Creating this more so that can add label to it on the project and don't lose track of it. @driusan already working on it
