moved draft popullation to save() method
encapsulate em all!
added more tests
Merge branch 'bugfix' into testing