Between Update Non working version

Just storing changes made until now.
So fallback is possible if i screw up. XD