Cleaned up header files.
Passing the cell's border still fails. No ideas how to fix it