Hopefully, the final changes before a working version.