This is a new branch based on Omega 4, although all these files are from a new build.