Added quantities and units of measure, started on better creep simulation