put template system back in but didn't integrate with study system