version bump and basic refactor