Moving towards version 0.2, not complete yet