wip!
wip
refactroring templates
add more fixtures to test
0.0.1