Save point 1

Fix list items

Rebasing stuff

Final tweaks