Refactored and added tests
Added partial markdown file