Implementations + fix template formatting