Refactoring
Added draft parser