Update. Still WIP on main code.