Working towards version 0.3.0. Ton of renaming and commenting.