Huge changes, started confparser & templateparser