Added basic markup and edited variables