removed some jinja
need to write drop_class
drop_period works
merged with master