doing some markup. Almost complete