V0.2 hackathon

merging