Big revamp for 0.1.