ntmark - 2016-06-23

FYI to others: dont use the changes above it breaks stuff.