Stripping branch down to bare basics for final version #0.1.0