huge refactoring of fabfile