Casteling Changes

Not 100% done yet