changed up facts classes
Merge branch 'feature/128-facts'