Revert "dummy commit, will fix my messup after this"

This reverts commit d2a2d4fed4f91fc2ab7d73599d6206f62e03eb2f.
Revert "Use std:: for everything, fix do-while"

This reverts commit 8e852afce88666f603b410f41a7905a13482a973.