added more template functionality - hell yeah