Tweak build sequence
New implementation, some tests