working

not finalized but there are fewer errors.