Some work done

But more to come ;)