Make basics functional
Fix issue with "+=" and similar