Dev 0.2.x

New architecture.