Updated to the md format
Updated syntax
Breaking circular dependencies