Layout/tracking

closes #9