Started implementing saving, needs fixing.