Prepare for 0.4 with moar fun