Feature: First draft of v5 base structure