Finishing up Indev 0.1.1