Newest working version, almost ready...