A few issues after the merging. All files working as the previous commits suggest now.