First version works
Format + remove abstract
Merge branch 'dev'