Merge conflicts resolved..

Still things do not I repeat DO NOT work :P