Much fix, no work - Don't even care about proper commits anymore