here goes nothin
includes Loris files
its pretty much all working with no added features
merge conflict