Worked a bit more on it, still not ready for implementing
 Please enter the commit message for your changes. Lines starting