Updated formatting, got validation working