Finial fina; changes?
Still trying to iron out commit bugs