Fixed up the branch so that katana would run

- Note: It will not run builds and merging of builds has errors