Changed to decimal

Still some major bugs