Initial codec work
Spacing fix