Feature/initial markup

PoC for the general markup.