Complete re-write
Planned more functions
Can now read files and find errors
Fixed conflicts
Basic functions added