Integration

Decided against making an official release, but kept some changes needed for it