Pushing version 0.3, entirely refactored