Move logic out a tad better
Version bump