Bumped version and started re-factoring