merge shit
Functionality update. Not complete
Local merge