Code inside lists

Complete diff is awful, so I broke change to two commits, so it's more understandable what exactly were changed.

It would fix #9 and I believe #13