Not exactly working, need to fix templates