This was a bad commit (my bad), Working code is already on a separate file.