first crack at 0.3
updates