First draft of OOP
Fix indentation
Remove dead file