Starting on fixing the slabs
Code Cleaning