Finally progress on my build