Locals and some uploads bugfixes
actually adding locals