Templates
Finished api implementation
Some changes in templates