Initial commit
Initial commit
More refactorings