Pla 217

Expect changes for tracking, I've also redone indentation