(#19) - WIP - Update in place