Nearly done with the alter, just a few bugs