This might break everything.. I really hope it won't

If it does break everything, nothing important was done and a rollback
to the last commit can be done. GitHub <3