Aded file support
Still cleaning...
Fun!