Yes, that would be where you need to focus energy. otherwise you are deluding yourself by continuing to add features to vanilla 1. Your questions are vanilla 1 specific and practically no one still fielding questions on this forum has ever used vanilla 1.