Started to attempt to fix the pointy bits