0.0.4a - Complete rewrite