Test implementation of rewriting
Fix timeout. Work on rewriting
Make IDEA project
Merge branch 'develop'