Cleaned up code, prepared adding link to and adding embedded content