Use line/column
Better handling of restarting. Not compiling right now. WIP.