Finished templates, still has bugs