Almost working. Tweaking positions

Committing before redoing some measurements