Work on base design and layout