LOTS of changes - just a backup

Do not use, basically broken, but still valuable :P