2nd branch

make sure to get rid of commented out code, if you have another possibility place it in another git branch.